from trunk
authorKenichi Handa <handa@m17n.org>
Mon, 25 Jan 2010 08:22:45 +0000 (17:22 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 25 Jan 2010 08:22:45 +0000 (17:22 +0900)

Trivial merge